Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 24 Jan 2012 18:05:59 +0000 (10:05 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 24 Jan 2012 18:05:59 +0000 (10:05 -0800)
commit9ea89239b333e6596fb864d6ac90e4ece5487c66
tree0825c0416a1b3cc48275e5f686b93e5e2d1ae3fd
parent8dbb0ae000b160f473e00b62a012fbac088dce18
parentc5da5c6bf29e969e3e3d231f6f91dd390718a0a1
Merge from trunk.